diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index c627486cd..ef520a47f 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -1840,9 +1833,6 @@ if test "$enable_eventfd_synchronization" -eq 1; then
 	if test "$enable_server_Shared_Memory" -gt 1; then
 		abort "Patchset server-Shared_Memory disabled, but eventfd_synchronization depends on that."
 	fi
-	if test "$enable_user32_rawinput_mouse" -gt 1; then
-		abort "Patchset user32-rawinput-mouse disabled, but eventfd_synchronization depends on that."
-	fi
 	if test "$enable_ws2_32_WSACleanup" -gt 1; then
 		abort "Patchset ws2_32-WSACleanup disabled, but eventfd_synchronization depends on that."
 	fi
@@ -1851,7 +1851,6 @@ if test "$enable_eventfd_synchronization" -eq 1; then
 	enable_ntdll_User_Shared_Data=1
 	enable_server_Realtime_Priority=1
 	enable_server_Shared_Memory=1
-	enable_user32_rawinput_mouse=1
 	enable_ws2_32_WSACleanup=1
 fi
 
@@ -1875,9 +1875,6 @@ if test "$enable_server_Shared_Memory" -eq 1; then
 	if test "$enable_server_Signal_Thread" -gt 1; then
 		abort "Patchset server-Signal_Thread disabled, but server-Shared_Memory depends on that."
 	fi
-	if test "$enable_user32_rawinput_nolegacy" -gt 1; then
-		abort "Patchset user32-rawinput-nolegacy disabled, but server-Shared_Memory depends on that."
-	fi
 	enable_ntdll_Threading=1
 	enable_server_Key_State=1
 	enable_server_PeekMessage=1
@@ -1876,7 +1876,6 @@ if test "$enable_server_Shared_Memory" -eq 1; then
 	enable_server_Key_State=1
 	enable_server_PeekMessage=1
 	enable_server_Signal_Thread=1
-	enable_user32_rawinput_nolegacy=1
 fi
 
 if test "$enable_user32_rawinput_nolegacy" -eq 1; then

diff --git a/patches/server-Shared_Memory/0005-user32-Get-rid-of-wineserver-call-for-GetLastInputIn.patch b/patches/server-Shared_Memory/0005-user32-Get-rid-of-wineserver-call-for-GetLastInputIn.patch
index aa1e8fd9f..e4afbfb98 100644
--- a/patches/server-Shared_Memory/0005-user32-Get-rid-of-wineserver-call-for-GetLastInputIn.patch
+++ b/patches/server-Shared_Memory/0005-user32-Get-rid-of-wineserver-call-for-GetLastInputIn.patch
@@ -54,9 +54,9 @@ index 4872251..f12109f 100644
 index d7c0f7178ec..337bdf3b044 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -1600,6 +1600,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
+@@ -1490,6 +1490,7 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg
  
-     update_key_state( desktop, desktop->keystate, msg->msg, msg->wparam );
+     update_key_state( desktop, desktop->keystate, msg );
      last_input_time = get_tick_count();
 +    if (shmglobal) shmglobal->last_input_time = last_input_time;
      if (msg->msg != WM_MOUSEMOVE) always_queue = 1; 
diff --git a/patches/eventfd_synchronization/0079-ntdll-server-Revert-to-old-implementation-of-hung-qu.patch b/patches/eventfd_synchronization/0079-ntdll-server-Revert-to-old-implementation-of-hung-qu.patch
index a22615aae..b3e73dd89 100644
--- a/patches/eventfd_synchronization/0079-ntdll-server-Revert-to-old-implementation-of-hung-qu.patch
+++ b/patches/eventfd_synchronization/0079-ntdll-server-Revert-to-old-implementation-of-hung-qu.patch
@@ -177,9 +177,9 @@ index 174a4ac09..56fa4d98c 100644
  
      if (!(msg = mem_alloc( sizeof(*msg) ))) return 0;
  
-@@ -3432,3 +3442,14 @@ DECL_HANDLER(get_rawinput_devices)
- 
-     set_reply_data_ptr( devices, device_count * sizeof (*devices) );
+@@ -3289,3 +3299,14 @@ DECL_HANDLER(update_rawinput_devices)
+     e = find_rawinput_device( 1, 6 );
+     current->process->rawinput_kbd   = e ? &e->device : NULL;
  }
 +
 +DECL_HANDLER(esync_msgwait)

 
